Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 10 Sep 2011 19:27:43 +0000 (12:27 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 10 Sep 2011 19:27:43 +0000 (12:27 -0700)
commit42a4d1c50f66249a83f5af0a7c0f239e41886a3e
treec4c894cebbe44c28243cdea42046b941241060ad
parent4696680f73e286baad9d6b79591d9f02b1c995e9
parente371dee14721637c9c56c3d6b00ec7cb0d634b12
Merge from trunk.